From 8ac9e21c6a97fa7baa24488d08faf86b34a05180 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 20 Jun 2007 15:06:17 +0100 Subject: [PATCH] hvm/x86: vendor-specific code can call vendor-specific routines directly Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 968e3b5fc9..1dfbfd763f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1476,7 +1476,7 @@ static void svm_io_instruction(struct vcpu *v) /* Copy current guest state into io instruction state structure. */ memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES); - hvm_store_cpu_guest_regs(v, regs, NULL); + svm_store_cpu_guest_regs(v, regs, NULL); info.bytes = vmcb->exitinfo1; @@ -2153,7 +2153,7 @@ static inline void svm_vmexit_do_hlt(struct vmcb_struct *vmcb) /* Check for interrupt not handled or new interrupt. */ if ( vmcb->eventinj.fields.v || - ((type != hvm_intack_none) && hvm_interrupts_enabled(current, type)) ) + ((type != hvm_intack_none) && svm_interrupts_enabled(current, type)) ) { HVMTRACE_1D(HLT, current, /*int pending=*/ 1); return; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index af0612173f..74d793c445 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1854,7 +1854,7 @@ static void vmx_io_instruction(unsigned long exit_qualification, /* Copy current guest state into io instruction state structure. */ memcpy(regs, guest_cpu_user_regs(), HVM_CONTEXT_STACK_BYTES); - hvm_store_cpu_guest_regs(current, regs, NULL); + vmx_store_cpu_guest_regs(current, regs, NULL); HVM_DBG_LOG(DBG_LEVEL_IO, "vm86 %d, eip=%x:%lx, " "exit_qualification = %lx", -- 2.30.2